New upstream release

  - d/copyright: update
  - symbols file: update
  - tests, ostree-tests.install: update for new location of tests
  - d/control: ostree-tests now needs python-yaml

diff --git a/debian/changelog b/debian/changelog
index 8a9fbebba9c85de7c6bc3da15ce35109e6adb74f..bbfebc0df14cb7b849348c12999f8b4c98275bcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-ostree (2017.1-2) UNRELEASED; urgency=medium
+ostree (2017.3-1) UNRELEASED; urgency=medium
 
   * d/watch, d/copyright: upstream project is now named libostree
+  * New upstream release
+    - d/copyright: update
+    - symbols file: update
+    - tests, ostree-tests.install: update for new location of tests
+    - d/control: ostree-tests now needs python-yaml
 
  -- Simon McVittie <smcv@debian.org>  Fri, 10 Mar 2017 23:09:00 +0000
 

diff --git a/debian/control b/debian/control
index b2f1f925b8ef6f4c801f237834a56e93cb67e66d..24795026108d10a96ac74bd27036a18a52cdca2b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -144,6 +144,7 @@ Depends:
  gjs [!sparc64],
  ostree,
  python,
+ python-yaml,
  ${misc:Depends},
  ${shlibs:Depends},
 Description: content-addressed filesystem for operating system binaries - tests

diff --git a/debian/copyright b/debian/copyright
index 827270f995ccb49100b5ad18d2230e5c09f39146..c21f8b5bdb97d8baf6619113cffc0c580b77a396 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,15 @@ Files: *
 Copyright:
  © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  © 1999-2000, 2002-2005 Free Software Foundation, Inc.
- © 2010-2016 Red Hat, Inc
+ © 1999-2003 Ximian, Inc.
+ © 2008-2017 Red Hat, Inc
  © 2011-2017 Colin Walters <walters@verbum.org>
  © 2011 Avery Pennarun
  © 2013 Collabora Ltd.
  © 2013 Stef Walter <stef@redhat.com>
  © 2013 Javier Martinez <javier.martinez@collabora.co.uk>
  © 2013 Jeremy Whiting <jeremy.whiting@collabora.com>
- © 2013 Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+ © 2013-2016 Sjoerd Simons <sjoerd.simons@collabora.co.uk>
  © 2014-2016 Alexander Larsson <alexl@redhat.com>
  © 2014 Owen Taylor <otaylor@redhat.com>
  © 2015 Dan Nicholson <nicholson@endlessm.com>

diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols
index 38d47cd799f156d8f646b73fb657bfe0cf8d85bd..3a44f398df87bbd903e68e19269f7feefa119bc2 100644 (file)
--- a/debian/libostree-1-1.symbols
+++ b/debian/libostree-1-1.symbols
@@ -8,6 +8,8 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  LIBOSTREE_2016.8@LIBOSTREE_2016.8 2016.8
  LIBOSTREE_2016.14@LIBOSTREE_2016.14 2016.14
  LIBOSTREE_2017.1@LIBOSTREE_2017.1 2017.1
+ LIBOSTREE_2017.2@LIBOSTREE_2017.2 2017.2
+ LIBOSTREE_2017.3@LIBOSTREE_2017.3 2017.3
  ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_type@LIBOSTREE_2016.3 2016.4
@@ -113,6 +115,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  ostree_object_type_to_string@LIBOSTREE_2016.3 2016.4
  ostree_parse_refspec@LIBOSTREE_2016.3 2016.4
  ostree_raw_file_to_archive_z2_stream@LIBOSTREE_2016.6 2016.6
+ ostree_raw_file_to_archive_z2_stream_with_options@LIBOSTREE_2017.3 2017.3
  ostree_raw_file_to_content_stream@LIBOSTREE_2016.3 2016.4
  ostree_repo_abort_transaction@LIBOSTREE_2016.3 2016.4
  ostree_repo_add_gpg_signature_summary@LIBOSTREE_2016.3 2016.4
@@ -201,6 +204,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  ostree_repo_read_commit@LIBOSTREE_2016.3 2016.4
  ostree_repo_read_commit_detached_metadata@LIBOSTREE_2016.3 2016.4
  ostree_repo_regenerate_summary@LIBOSTREE_2016.3 2016.4
+ ostree_repo_reload_config@LIBOSTREE_2017.2 2017.2
  ostree_repo_remote_add@LIBOSTREE_2016.3 2016.4
  ostree_repo_remote_change@LIBOSTREE_2016.3 2016.4
  ostree_repo_remote_delete@LIBOSTREE_2016.3 2016.4

diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install
index 3e3c075d34aa78814049aac2e329a5c53e496d07..f28de12134ef2b860ec1d491b58a34737cd48ce5 100644 (file)
--- a/debian/ostree-tests.install
+++ b/debian/ostree-tests.install
@@ -1,3 +1,3 @@
-usr/lib/installed-tests/ostree
+usr/lib/installed-tests/libostree
 usr/lib/ostree/ostree-trivial-httpd
-usr/share/installed-tests/ostree
+usr/share/installed-tests/libostree

diff --git a/debian/tests/gnome-desktop-testing b/debian/tests/gnome-desktop-testing
index 0bf126ddc1995ba42092552ee4f19aaae22f959f..b5d57a760ff599da9f2f66848df8d665949e192d 100755 (executable)
--- a/debian/tests/gnome-desktop-testing
+++ b/debian/tests/gnome-desktop-testing
@@ -5,11 +5,11 @@ exec 2>&1
 
 e=0
 
-tests="$(gnome-desktop-testing-runner -l ostree | while read t; do
+tests="$(gnome-desktop-testing-runner -l libostree | while read t; do
        t="${t%% *}"
 
        case "$t" in
-               (ostree/test-local-pull.sh.test)
+               (libostree/test-local-pull.sh.test)
                        # frequently times out, https://bugs.debian.org/842606
                        # https://github.com/ostreedev/ostree/issues/605
                        continue

diff --git a/debian/tests/test-local-pull b/debian/tests/test-local-pull
index 36f64d85a1037e49b6a24bf0fb713be1b876761a..ab4e5fe7f206c09a2c8c270a6afa34e2ccd41493 100755 (executable)
--- a/debian/tests/test-local-pull
+++ b/debian/tests/test-local-pull
@@ -7,7 +7,7 @@ N=3
 passed=0
 
 for i in `seq 1 $N`; do
-       if gnome-desktop-testing-runner ostree/test-local-pull.sh.test; then
+       if gnome-desktop-testing-runner libostree/test-local-pull.sh.test; then
                passed=$(( $passed + 1))
        fi
 done